From 551365b6a07ceea5af453212d075a711af280ea9 Mon Sep 17 00:00:00 2001 From: "jchesterfield@wicket.uk.xensource.com" Date: Fri, 15 Sep 2006 18:48:24 +0100 Subject: [PATCH] Adding max block device timeout of 30 secs for live migrate. --- tools/python/xen/xend/XendDomainInfo.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 259aaab331..598efc7c91 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -86,6 +86,7 @@ STATE_DOM_OK = 1 STATE_DOM_SHUTDOWN = 2 SHUTDOWN_TIMEOUT = 30.0 +MIGRATE_TIMEOUT = 30.0 ZOMBIE_PREFIX = 'Zombie-' @@ -1535,8 +1536,10 @@ class XendDomainInfo: the device has shutdown correctly, i.e. all blocks are flushed to disk """ + start = time.time() while True: test = 0 + diff = time.time() - start for i in self.getDeviceController('vbd').deviceIDs(): test = 1 log.info("Dev %s still active, looping...", i) @@ -1544,6 +1547,9 @@ class XendDomainInfo: if test == 0: break + if diff >= MIGRATE_TIMEOUT: + log.info("Dev still active but hit max loop timeout") + break def migrateDevices(self, network, dst, step, domName=''): """Notify the devices about migration -- 2.30.2